From 40f2f9a378fcf3b4e12e94a9394357dd4b5432ca Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 9 Dec 2005 10:06:36 +0000 Subject: [PATCH] Fix debian/rules for non-native arches, which I broke in 3.09.0-2. Sorry for this :( --- debian/changelog | 7 +++++++ debian/rules | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9d5e4935..07de0561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ocaml (3.09.0-3) unstable; urgency=low + + * Fix build on non-native arches which was broken by the changes to + debian/rules in the previous release. Sorry for this :( + + -- Julien Cristau Fri, 9 Dec 2005 11:01:06 +0100 + ocaml (3.09.0-2) unstable; urgency=low * Modified debian/rules to exit with an error when native compiler build diff --git a/debian/rules b/debian/rules index 206777bc..ff317199 100755 --- a/debian/rules +++ b/debian/rules @@ -74,12 +74,11 @@ build-arch-stamp: patch-stamp config-stamp fi $(MAKE) world $(MAKE) bootstrap -ifeq (,$(shell grep "ARCH=none" config/Makefile)) - @echo "Building native compilers" - $(MAKE) opt - $(MAKE) opt.opt - touch opt-built-stamp -endif + if ! grep -q "ARCH=none" config/Makefile; then \ + echo "Building native compilers" && \ + $(MAKE) opt opt.opt && \ + touch opt-built-stamp; \ + fi if [ -x ./ocamlopt ]; then \ $(MAKE) -C debian/ocaml-md5sums opt; \ else \ -- 2.30.2